Update for stayput master and ensure forward compatibility