Merge "Revert the revert. (its time to sign MR1)" into klp-dev