Commit on master before feature-3 branch rebase